Move new draw_drawable argument to end to make it more backwards compat

diff --git a/gdk/gdkdraw.c b/gdk/gdkdraw.c
index 321b883cb32dd7084865290e4fe0cd958010a623..ad0af7989a49b67d148487bb9b82d439006d7f55 100644 (file)
--- a/gdk/gdkdraw.c
+++ b/gdk/gdkdraw.c
@@ -669,11 +669,12 @@ gdk_draw_drawable (GdkDrawable *drawable,
      area in the destination instead. */
 
   GDK_DRAWABLE_GET_CLASS (drawable)->draw_drawable (drawable, gc,
-                                                   composite_impl, src,
+                                                   composite_impl,
                                                     xsrc - composite_x_offset,
                                                     ysrc - composite_y_offset,
                                                     xdest, ydest,
-                                                    width, height);
+                                                    width, height,
+                                                   src);
 
   g_object_unref (composite);
 }

diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 1d8d69471d7c93af4a909f504ca39691e8350072..21af0d1dc8702801ae654d4b9135f251cc4443e9 100644 (file)
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -100,13 +100,13 @@ struct _GdkDrawableClass
   void (*draw_drawable)  (GdkDrawable  *drawable,
                          GdkGC        *gc,
                          GdkDrawable  *src,
-                         GdkDrawable  *original_src,
                          gint          xsrc,
                          gint          ysrc,
                          gint          xdest,
                          gint          ydest,
                          gint          width,
-                         gint          height);
+                         gint          height,
+                         GdkDrawable  *original_src);
   void (*draw_points)   (GdkDrawable  *drawable,
                          GdkGC        *gc,
                          GdkPoint     *points,

diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c
index 2c1157c2712684f32d28c52bdcc702f0a4909748..8a020bbe60a511b260422143733f5d24214ae21e 100644 (file)
--- a/gdk/gdkoffscreenwindow.c
+++ b/gdk/gdkoffscreenwindow.c
@@ -284,13 +284,13 @@ static void
 gdk_offscreen_window_draw_drawable (GdkDrawable *drawable,
                                    GdkGC       *gc,
                                    GdkPixmap   *src,
-                                   GdkDrawable *original_src,
                                    gint         xsrc,
                                    gint         ysrc,
                                    gint         xdest,
                                    gint         ydest,
                                    gint         width,
-                                   gint         height)
+                                   gint         height,
+                                   GdkDrawable *original_src)
 {
   GdkOffscreenWindow *offscreen = GDK_OFFSCREEN_WINDOW (drawable);
   GdkDrawable *real_drawable = get_real_drawable (offscreen);

diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index e4d8869286b5ac3118c0922900e9f5a0e26df7bf..e9f33aa84713d22c343cf2819e76e6a1731ef762 100644 (file)
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -72,13 +72,13 @@ static void   gdk_pixmap_draw_text_wc   (GdkDrawable     *drawable,
 static void   gdk_pixmap_draw_drawable  (GdkDrawable     *drawable,
                                         GdkGC           *gc,
                                         GdkPixmap       *src,
-                                        GdkPixmap       *original_src,
                                         gint             xsrc,
                                         gint             ysrc,
                                         gint             xdest,
                                         gint             ydest,
                                         gint             width,
-                                        gint             height);
+                                        gint             height,
+                                        GdkPixmap       *original_src);
 static void   gdk_pixmap_draw_points    (GdkDrawable     *drawable,
                                         GdkGC           *gc,
                                         GdkPoint        *points,
@@ -375,13 +375,13 @@ static void
 gdk_pixmap_draw_drawable (GdkDrawable *drawable,
                          GdkGC       *gc,
                          GdkPixmap   *src,
-                         GdkPixmap   *original_src,
                          gint         xsrc,
                          gint         ysrc,
                          gint         xdest,
                          gint         ydest,
                          gint         width,
-                         gint         height)
+                         gint         height,
+                         GdkPixmap   *original_src)
 {
   GdkPixmapObject *private = (GdkPixmapObject *)drawable;
 

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index bf35eeabf2eb8512efc91c37e95738c0d39b7ee3..d15b660f7867d9ad77713c844881c6ad88a8c80b 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -188,13 +188,13 @@ static void   gdk_window_draw_text_wc   (GdkDrawable     *drawable,
 static void   gdk_window_draw_drawable  (GdkDrawable     *drawable,
                                         GdkGC           *gc,
                                         GdkPixmap       *src,
-                                        GdkDrawable     *original_src,
                                         gint             xsrc,
                                         gint             ysrc,
                                         gint             xdest,
                                         gint             ydest,
                                         gint             width,
-                                        gint             height);
+                                        gint             height,
+                                        GdkDrawable     *original_src);
 static void   gdk_window_draw_points    (GdkDrawable     *drawable,
                                         GdkGC           *gc,
                                         GdkPoint        *points,
@@ -3485,13 +3485,13 @@ static void
 gdk_window_draw_drawable (GdkDrawable *drawable,
                          GdkGC       *gc,
                          GdkPixmap   *src,
-                         GdkDrawable *original_src,
                          gint         xsrc,
                          gint         ysrc,
                          gint         xdest,
                          gint         ydest,
                          gint         width,
-                         gint         height)
+                         gint         height,
+                         GdkDrawable *original_src)
 {
   GdkWindowObject *private = (GdkWindowObject *)drawable;
 

diff --git a/gdk/quartz/gdkdrawable-quartz.c b/gdk/quartz/gdkdrawable-quartz.c
index 673da0647710a49b55a59916e7838e8cf3f2eaab..be08c7db641da2386fb530b26dbcca70fb9c2b5a 100644 (file)
--- a/gdk/quartz/gdkdrawable-quartz.c
+++ b/gdk/quartz/gdkdrawable-quartz.c
@@ -326,13 +326,13 @@ static void
 gdk_quartz_draw_drawable (GdkDrawable *drawable,
                          GdkGC       *gc,
                          GdkPixmap   *src,
-                         GdkDrawable *original_src,
                          gint         xsrc,
                          gint         ysrc,
                          gint         xdest,
                          gint         ydest,
                          gint         width,
-                         gint         height)
+                         gint         height,
+                         GdkDrawable *original_src)
 {
   int src_depth = gdk_drawable_get_depth (src);
   int dest_depth = gdk_drawable_get_depth (drawable);

diff --git a/gdk/win32/gdkdrawable-win32.c b/gdk/win32/gdkdrawable-win32.c
index c5a11ccffce2f82903d4cc5e306c4fad02c8ed70..e6c7e45ef7f3877213bf83fdf3c4c063d6cf99dc 100644 (file)
--- a/gdk/win32/gdkdrawable-win32.c
+++ b/gdk/win32/gdkdrawable-win32.c
@@ -87,13 +87,13 @@ static void gdk_win32_draw_text_wc   (GdkDrawable    *drawable,
 static void gdk_win32_draw_drawable  (GdkDrawable    *drawable,
                                      GdkGC          *gc,
                                      GdkPixmap      *src,
-                                     GdkDrawable    *original_src,
                                      gint            xsrc,
                                      gint            ysrc,
                                      gint            xdest,
                                      gint            ydest,
                                      gint            width,
-                                     gint            height);
+                                     gint            height,
+                                     GdkDrawable    *original_src);
 static void gdk_win32_draw_points    (GdkDrawable    *drawable,
                                      GdkGC          *gc,
                                      GdkPoint       *points,
@@ -1144,13 +1144,13 @@ static void
 gdk_win32_draw_drawable (GdkDrawable *drawable,
                         GdkGC       *gc,
                         GdkPixmap   *src,
-                        GdkDrawable *original_src,
                         gint         xsrc,
                         gint         ysrc,
                         gint         xdest,
                         gint         ydest,
                         gint         width,
-                        gint         height)
+                        gint         height,
+                        GdkDrawable *original_src)
 {
   g_assert (GDK_IS_DRAWABLE_IMPL_WIN32 (drawable));
 

diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 2b9b1d2c4e7a74280d19e4c8422e0415ec8b7333..9a69a3bb10ab01993798a7468b41f249a6da5019 100644 (file)
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -88,13 +88,13 @@ static void gdk_x11_draw_text_wc   (GdkDrawable    *drawable,
 static void gdk_x11_draw_drawable  (GdkDrawable    *drawable,
                                    GdkGC          *gc,
                                    GdkPixmap      *src,
-                                   GdkDrawable    *original_src,
                                    gint            xsrc,
                                    gint            ysrc,
                                    gint            xdest,
                                    gint            ydest,
                                    gint            width,
-                                   gint            height);
+                                   gint            height,
+                                   GdkDrawable    *original_src);
 static void gdk_x11_draw_points    (GdkDrawable    *drawable,
                                    GdkGC          *gc,
                                    GdkPoint       *points,
@@ -619,13 +619,13 @@ static void
 gdk_x11_draw_drawable (GdkDrawable *drawable,
                       GdkGC       *gc,
                       GdkPixmap   *src,
-                      GdkDrawable *original_src,
                       gint         xsrc,
                       gint         ysrc,
                       gint         xdest,
                       gint         ydest,
                       gint         width,
-                      gint         height)
+                      gint         height,
+                      GdkDrawable *original_src)
 {
   int src_depth = gdk_drawable_get_depth (src);
   int dest_depth = gdk_drawable_get_depth (drawable);